#74 - Initial review fixes.