Minor tweeks so that standalone will work.