Fixes and tests for callable and object types