Patch up some bugs for now