Fixed Minor Issues