Chapter one fixes