Made some fixes to current dev