Updates to conform to latest amorphic and bug fixes