Make sure we are actually in foreign module call mode
Polish updates