Harbour changes

Bug fixes
Bug fixes in harbour changes