Small changes/bugfixes