Fixed errors with backport