Fixes from the SW demo