Updates to fix minor problems