Fix gremlins