Fix moar outstanding issues

Tin. Label.