Fix a class that is wrap excluded when it should be wrapped
Fix a shadowed variable
Fix an implicit cast to double

Change-Id: Ie87c71a6c0332b5af7f6dce5497eba10d75ddd92