Internal Issues fixing