Comment fixes