[Chris] A bug fix here and there