A couple of byte-compilation warnings gone