2 little bugfixes
2 little bugfixes