Fixes for Stored Procedure Mapping