Brfore finished fixes