Pushed fixes from last commit; accidentally checkout-ed master which era...

...sed the fixes