Fixes for ormed-401