Second set of fixes