Fixes regarding comments