Implemented small fixes.