A few random fixes
Few more random fixes