Minor tweaks

This change includes minor tweaks to the functionality and ensures
that everything works as expected.