Fixes for Heaven Can Wait 1-4