fixup compilation issues with +BUFFER-SIZE+

Thanks to Faré for finding the issue.
tidy up the system definition a bit