Fixing CS mistakes