Various fixes and additions for Finntack

@clementhk Hey, this are the changes based on 2.6 that I made. I just want to make sure that any changes are tracked properly :)
If you want to leave the commented code in, then maybe also add an explanation in it.
I don't think we should leave it in in this case, will check it in a bit.