Master various small fixes