build: several build simplifications