Fixing stupid bugs