Fixes

See the diff!