Make work with R15; "TOP" fix; rebarify