Fixes after @szeiger's comments