- Various minor fixes