Calibu alignment fixes.
Some alignment and consistency fixes.