Small fixes

A few small fixes from the error logs or reports ... plus some updates to the split topic template