Less noise in log, bug fixes