Minor Fix
Fix minor code issues