Fix some scopes
Update and freeze dependencies