Fix issues Matt spotted