Fix some things - 2