Fix some byte-compile issues