tweaks for maintenance and collect static