Fixes and enhancements for demo installation