Weston fixes for static analysis issues