Cleaned up to remove some byte-compile warnings