Minor stuff didn't commit before demo