Further fixes to getattr()