Fixed Incomplete type errors