fixes that cause things to actually work