Fix some bugs from last night