Fix byte compiler warnings

No functionality changes, just fixing byte compiler warnings.