Fixes to PickRay check