More fixes for mod_offline merge.