Misc fixes for uniformity