Fixup last commits