Small Fixes - Part One