Make things more suitable for our setup