Minor fixes/changes