MORe bug fixes