Fixes - Minor fixes that I cleaned up