Fix build & cleanup