Fixes to definitions and rowcount