Slightly more strict checking
Fix member access checking