Fixing things to work