Minor changes / fixes