A few patches for bodhi pungi compose