Small fixes with work for handler