Some small fixes because of wprzyb/patch-*