Build and style cop fixed