Bug fixes in harbour changes