Minor changes, more informative log output