Fixes for handler + others