Fix _oasis and and various fixes on code