don't store internal resources into hot start cache
small fixes in templates