Port over changes to the 0.1 branch