Fixes and solutions