Fixed some random issues