Fixed a couple of bugs
Fixed a couple of bugs