Several random fixes.