Modify some things with hopefully fixes