Few wee fixes