some hot fixes