Quick Pre-demo Fixes