More Ruby fixes