David - Couple more fixes and changes