Bug 988402 - Some other changes that might not be strictly needed