Minor changes to appease ZeroBrane