Fixes by @stof coments