fix - apply fixes