Fixed Errors after merging