More cleanup on build output paths