Updates to try and fix bugs