first batch of license fixes (boring)