bug 775485 - minor cleanups