Made a few fixes as the UI wasn't working after changes for the testing.