Some fixes after WiQuery/Wicket 6 changes.