Initial modifications
Fixes