Performance optimizations / validation fixes