some changes for 0.3 comaptibility