Fixes after verification with Jason