minor Code Fixes