WICKET-3335 Add some TODOs