fixes for 1.3