Fixing some random issues