Fixed compilation issues by previous commit (I should really be compiling my code before I commit it)