Minor logging and build tweaks