Pushing in some fixes