Some other tweaks