Fixed kernel problems under 13.12

Should address #284