kiddo: structure fixes