Fix for FB 4927, and some ride alongs....