Removed $APP_POSTFIX from places where it's already applied