Finish phase 1 of silencing compiler warnings