Debug log fixes