Fixes for more comments