Minor fixes to what I just broke