Fix build & clean