Fixed some minor screwups