Fix build and clean up