Fix build errors from merge, slightly adjust logging system.