emulator: two small fixes
Merge branch 'master' of github.com:svenstaro/uni-projekt
Merge branch 'master' of github.com:svenstaro/uni-projekt