Small updates (also fixes #3).