Fix last commit mistakes