Typo on roles and cleanup of build script