Minor last minute cleanup