Make basecode compatible