fixed some mixups while migrated for wicket 6