Misc potential bugfix.