Additional Code Corrections