Filled in a couple missing lib pieces.