Various (very small) fixes