Fixed misc goofs