Fixed misc. compile time errors