Mostly fixing stuff