Minor edits to allow jumptypes