Fix for 1.3 compatibility issues

Fix 1.3 compatibilities