Fixes for smaller issues.