Fixes for reflection