Final (?) bug fix in KenneyContainer and simplification