Fix outstanding issues

It does exactly what it says on the tin.