Fixes

More fixes