Fixed issues after last commits