Catching up with some 0.1.2 changes