(BB10) Build fixes
(General) Fix some unused variable warnings