Fixed Some Minor Issues