fix - apply more fixes