Uniform fixes

Now fixed, reference issue #3 for a full description.