Initial 1.8 update stuff