Changes to work on showtime 4.0