Cleanup, compile fix