Fixes and a change