wip/g95/patches
