A fair few fixes