Fixes and new errors