Fine tuning

Changed deprecated call and attribute visibility.