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 :)
Reviewed.