Smaller bugfixes and workarounds.