Assets 2

Fixed some issues that didn't make it into 1.17