Updated to match warnings in latest compiler