Fixed issues after real world usage