Copied the fixes to BlueJ - I really have to automate this