Fixes in Code