Fix small stuff
Fix stuff