Fixes for 1_7