Fixes made during demo