Harbour + Local fixes and additions