A few bugs fixes that have been caught.