Small fixes before integrating libRocket