Fix previous commit issues