Fix facade
Bugfixes