Added better defaults for building