Fix errors after Slim rebase