Small updates (should move into 0.2.0)