Adding stuff I missed in last checkin