Fix failures and extend Shape