A few CALL fixes.