Fix a load of bugs