Little fixes for empty lists