Fixed issues with last changes.