bug fix
fix warnings in Support library