Fixed issues that were missed by my IDE in the last commit.