Fixes after @svenfuch's suggestions