Added support for Jackson Howard, trap fixes