Bugfixes Discover Raspberry

Started bugfixing