Bug fixes (missed in previous check-in)