Fix some stuff, add elementaryos support