WIP: more runtime/real world fixes