Fixing stupid stuff from FJ