fixes for the automatic build