Go a little more generic to make travis happy