Fix some criticals from nemo.