minor improvements to the wicket