Add some fixes and stuff