Some slight fixes