Updates to remove errors