Call Type Fixes