Changes to comply with Harbour requirements