Fixes for Harbour submission.