Fixes spacing and builds