Fixes to get docker building