Fixed lot of things