Build simplifications