Fixes for remaining comments