Fixes 288 minor changes