More fixes

this will work for all situations