fixes a few gremlins