Minor tweaks

This pull request includes some minor tweaks and improvements.