few fix / improvements for future deployment