Fixing some details