Fix multiple issues after the first round of testing