Fixed less bugs