Other fixes for Wicket