Minor Code Corrections