Nothing major, small fixes