code gardening
core: WIP getting rid reflection warnings