Fixed misc. problems.