Fix previous commits