Misc bugfixes.

After a tiny break, I have resumed development activities.