Fix some reflection issues