Fix a byte-compile issue and warnings.