Fix some Docker errors
merged