Minor improvements and unification