Just some tweaks to reduce warnings and notices for uptight PHP servers.