Clean-ups for 0.4.7