Fixed misc things...