More bugfies