Ok, fixed locally. Thanks.
Should i rebase all this into one commit then?