Some fixes that may break how it works