More coverage and fixes...