Fixed both issues from last checkin