Added some random fixes