Fixing i9100 compile errors