Fix some up can-can

There were a number of small issues, but the main issue is the one I line noted bellow.