General: Initial 1.8 Fixes