Overide Fixes