More fixing for better boolean checking.