Matt Dirks demo misc fixes