Minor changes so that TinyG might work.