Fixes after John's fixes