Small contributions to Wicket