More bugfix attempts.