Made some small changes to hopefully allow BarMagnet to build for anyone.