Fix some issues with axes/shape propagation