Updates to various things to fix bugs