I've reviewed some of the code from your port, and it seems like you've forgotten to carry the one in a few places.