Fixes related to the tie thing