Demo 3 Fixes