Fixes for Idris changes