Couple minor updates and bug fixes.