Some fixes required after update