Fixes per comments from jacobian and aaugustin