CODE FIXES