Some build and remove rules fixed