Fix byte-compile warnings