Cleaned up a couple o' errors