Improve robustness and comment out warnings