Fixes small bugs.