Feature #1483: Minor fixes