Hacky fixes to stacking