Smoothed some issues out