Updated for minor fixes