Some fixes against FreeRDP trunk