Small fixes (design etc.)