MISC - Helper improvements