Some fixes related to app harbour setup.