Various fixes/warning suppressions