3.0 - Fix build errors and warnings