More funny fixes!