Fix building and update a few things