Final fixs