Fix callbacks and multiple spaces