Fixes to work with 1.3