Fixes on functionality.