Fixes for bugs.