Uploaded some fixes