Fix last commit and prepare for next