Some more fixes on plane.c