final fixes for EvoBox