A few random fixes