More acndev fixes