Fix some issues with number of face/inner sites not multiple of inner length