These seem to work fine now.