Updates fixes and stuff