Updated deprecated values; fixed warnings