Little random fixes