Misc additions/fixes so that I have less to merge later.