Fix for unused machine types