Fixes and improvements

These are a few general fixes/improvements and some that are required to use Seoul in NRE (see https://github.com/Nils-TUD/NRE/commit/0675608f44d2f8335d84928328249470ea607b69).