Did some small fixes.