Some parts forgotten in previous commits