Unix EOLs, couple extra tweaks