Fixes from Balazs, basics for 07