R1:643fe8e9381f

Haiku fixes for tree and painting, locking etc.