Fixed misc things