Some small maintenance