Fix reflection warnings, more cleanup