Manual update of moregates from Furious Koala