Fixes to reflection; still bugged.