Code Fixes

Code Fixes