Add support for weeks domain, other fix