Fixed build errors from previous commit