Design fixes, out of range init.