Fixed / suppressed warnings