First batch of fix