Fixed some more stuff for #5