Fixes for a couple of errors with Xc5.1