Integrate cvailak and sbanc comments