Bug fixes, reflections