More incomplete type error fixes