Fixed build and cleanup