Fixing some confusing things