small fixes to make everything load correctly under harmony