Fix a couple of things
This should work