Fixes some strings, removed Generic_Time_*