Pushed fixes from last commit; accidentally checkout-ed master which erased the fixes