Update/fix various things