Chronus: Optimizations

Change-Id: Ibf7dd856649595262f10801b4dd4becb436065b1