Bugfixes from compiler warnings.