Fixed a few more #160