Fix last commit errors