Fixes couple more bugs.