Changes Fixes