Small changes to fix new errors