Minor fixes. Fixed Enter form detach and a type