Bug fixes for using ThinFrame with global sources