ReturnNode + fixes