Clean up byte-compile error/warnings