Final tweaks so that 'import twitter' does not fail