825d some fixes