Updated build shiedls to be less ugly