Fixed a few broken bits of functionality