Last fixes for 1.5 rebase