Fix a few things, small error gone second time around