Some xmlonly bugfixes