Fixed bugs that Lydia found :D