Some fixs to make it work from console 0.1.1