Fix bugs to allow gameplay