Some minor fixes

Please merge.