further changes to try get it to compile with mruby master