Shaping fixes: