some fixes in immutables