Platform compatibilty + Docker CLI fixes