Fixed stuff that broke for newtron