Some hotfixs