Fixes for some remarks