Some small fixes
Minor improvements