Some fixes for v0.3 that I forgot in the previous commits.