Fixes for __setattr__ wrapping with working __dir__