Minor changes, remove pending (should work now)