Fix docker error and issues