Small fixes by @lucasbibiano