Few PR tidy ups