More fixes after testing on existing D6 project