Updated build stuff