Updating some minor bugs