fixes for portable