more changes for 1.8 compat