Small fixes.
Keep folder clean