Did some fixes