Fixing some typing issue...