Fix some analyzed problems