Fixed some errors with the Popcorn events