Add proper evaluation of resulting type instead of always returning bool
Small fixes