DB/Misc: Misc fixes for End Time