[master] Fixes for the Datetime spoke