Fixes to make code work inside homino!