Reverted changes
Small fixes