More work toward jessie compat