Metacity fixes.