Code Fixes