QAART-31 Fixes for comments