Fixed up things so there were no more warnings on compilation