Some fixes for the extras module