Fixed bugs from last night