More tailer tweaks