suppress warnings and a bugfix