Fixed for Harbour

[B] Fixes to pass harbour validation.