Fixed some more breakage issues