Fixed some build errors from previous commit