Bug fixes

Pending
 - Harbour changes