FUNCTION format, CALL fixes