Very minor style changes/bugfixes