Adjusted to latest fixes in ciron and hawkc