Fixing huge bugs