Bugfixes for IRIC