Udated to highest level of void-safety.
Fixed obsolete calls.