Minor fixes/workarounds before Sprint 2