Some minor bug fixes from the initial deployment