Cleaning house and fix a fail