Fixing some build errors from previous commit