Internal issue Fixes