Yoshi's dev/release independant fixs