Fixes for 1.3.10 v3

Small fixes for 1.3.10.