more ruby context fixes