Removing reflection warnings
More tweaks