FIXED SERIALUID and @SupressWarning issues