Minor fixes/updates