Fix some uninitialized/unused variables