Fixes made based on the reviews