Small fixes for re usability