Fixed some shape issues. #122