Attempted bugfixes.