Com loader bugfixes