Add missing semicolons, fix code coverage