Correct stuff based on feedback from @jakubholynet