Yet another bugfix round