Fixed: several minor warnings