Minor changes
Fixing merge issues