[archimedes]: Minor archimedes improvements