IntNode and other changes