Code Fix - multiple problems