SQL: Rename some SQLs for 4.3.4 branch in correct name
Core: Fixed some compile warnings