Minor changes / fixes / cleanup