Fix stuff for 10.10