Some fixes from the first actual implementation.