Added more patches and helpers, improved checking