removed absoulte references
Post merge fixes
Abs ref fix
Abs ref fix