Fixed minor defects