0.8: small corrections

I fixed a few problems I encountered while upgrading my application to the current 0.8 in master.