Fix up trap and more debugging