Small fixes for ping enforcement