Adjustments and error fixes