Fixed a few more things for #66