Fixes for complex object