Minor fixes for my own usage.