Clean up && Fix build