Fixes for 1.3