Small tweaks to make tests pass on julia 0.4