Alert time fixes