Corrected some issues