added some 0.3+ compats