Couple more small fixes