Applying some fixes.
Preparing to rebase.