5.5 support and windows fix