Fixes to get icycle working.