Fixes issues based on feedback

This commit addresses comments made by @jvazquez-r7.