Fixed build and enforcer rules