#69 - Initial review fixes.