Changes to support running with felix gogo console