Make changes to allow eCube to compile