Edit fixes