Corrected a lot of bad oscaar sub-module calls