Fix problem with external administration
Fix merge problems