Initial checkin
Couple fixes