Other random fixes