Feature requests (two)