Directory changes and other tweaks.