OK more fixes were needed