More cleanups; added target variable in app.fullname.