Minor bug fixes, and smarty improvements.