Fixed wrong things