Some cleanup and linux features