Fixing some technical points