Fixed deprecated calls / Strict Coding