Correct warnings and disable some code in progress.