Final small fixes