Several improvements in scanning and fixing content