Fixes and changes