Some fixes directly from Altis Life Repo to keep our code updated.