Fixed stuff broken by jquintas.