More git screw up fixes. Just hand selected lines to be pushed before and stashed the rest - ended up with corrupted update :(