Bug fixes in harbour