Latest - Fixed a few errors