v1.5.2: Some minor bugfixes.