Fixed some codes