Fix Joels mistakes