Quick fixes to get things running on SS3