Fixed the issues brought up by Kyle