Fixed some small regression issues